Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen