Merge proposals dependent on lp://staging/~robertcarr/unity/phablet-integrate-mir-api-changes

lp://staging/~robertcarr/unity/phablet-integrate-mir-api-changes has no merge proposals.