Merge "Wait for notification shade to redraw on orientation change" into sc-dev