Merge "Fix 3493373: back button displays blue homescreen borders"