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

Change-Id: I5480cd6b338a25e97712d94464bf6b03237cfff9