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