am 7b879999: Merge "Fix issue #7238170: Edit picture option is not available...
am 7b879999: Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev
* commit '7b879999':
Fix issue #7238170: Edit picture option is not available for the secondary user.