Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev