Add cherry-pick

Cherry-Pick Multi Window https://gerrit.omnirom.org/#/c/1510/
and workaround for broken hardware keyboard support https://gerrit.omnirom.org/#/c/3011