am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app"

* commit 'a4e34ae82f2ccf037875462809be6e5139807b44':
  Properly handle quick switch between Home button and Gallery app