Merge "DO NOT MERGE: Add ScreenObserver" am: 68ad3d119c  -s ours
am: da57c7d0e9

Change-Id: Ifaab0c2d5265ccfd148edbc77668c67724de915e