Merge "Added rotation support to frame-callback" into devel/master