Merge "Fixing rotation watcher not enabled in landscape" into ub-launcher3-rvc-dev