Merge "Change notification shade ordering."