Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
am: 305d610fd8

Change-Id: Ib3d0beeed54a52b1185456b0c859859c61548d50