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