Merge "DO NOT MERGE: Add ScreenObserver"