Code review comment for lp:~cyphermox/unity/multimonitor

I fixed all but 5.) of the issues Sam raised. I've pushed the corrected branch (and re-merged with trunk) to lp:~canonical-dx-team/unity/unity.fix-675862

This is to avoid messing with other people's personal branches.