am 30417507: Merge "Fixing issue where Quick Settings user profile was not...
am 30417507: Merge "Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)" into jb-mr1-dev
* commit '30417507':
Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)