Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54cb8

Change-Id: I52b10ebb7334ae0fed8a5b81504658723e9207b6