Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/apps/homescreen