Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd61 am: 48976ab9 am: c2cd0486 am: 4796a182 Change-Id: Ie98e71698ff970beed522a0b2fb48252c57a515d