Merge proposals dependent on lp://qastaging/~3v1n0/unity/focused-non-top-windows-fix

lp://qastaging/~3v1n0/unity/focused-non-top-windows-fix has no merge proposals.