Unity

Merge proposals dependent on lp://staging/~brandontschaefer/unity/fix-lockscreen-hidpi-support

lp://staging/~brandontschaefer/unity/fix-lockscreen-hidpi-support has no merge proposals.