Merge "Fix remote views cache to avoid lockscreen widget crosstalk" into jb-mr1.1-dev