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

Change-Id: Icbc53b1d1c65b60dd128f4d3f3b4e59367f4a3a1