Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev