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