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

Change-Id: I095b6af71821585064f51f3a992293b21fabc742