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

Change-Id: I539bcfbe9583c67873492c2f210cf4a863265150