Merge "Fixing duplicate status bars in split shade"