Merge "Revert to O home button behaviour for over lockscreen activities" into pi-dev am: e8b7b30672
am: d2d0955edf

Change-Id: I3150d6aeb03108d93c7b88fc4f393039478fd0dc