Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev