Merge proposals dependent on lp://qastaging/~unity-2d-team/unity-2d/charlotte-transparency-plan-b

1. charlotte-transparency-plan-b
2. Dependent merge proposals