Merge "[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: aaec0d4ac3 am: dd3baf3304 am: 58d7dae053 am: 81dfe2bfec -s ours"