Merge "Updated control transitions to work with visual transform" into devel/master