Merge proposals dependent on lp://qastaging/~pete-woods/unity8/remove-indicator-session-hacks

lp://qastaging/~pete-woods/unity8/remove-indicator-session-hacks has no merge proposals.