Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd61 am: d4797a1d am: d2c04ff8 Change-Id: Ic23e94fc10de2d605d5cf0047db3a1fd485fc383