Merge branch 'meego-7093' into idle-release