Merge "Remove the deferred RotationObserver from the Adaptor" into devel/master