Initial empty repository
Merge remote-tracking branch 'upstream/master'
Fix window positioning on multi-headed desktops

Change-Id: If12e60c1d31365fc922c53135bd9049c75bfe327