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

* commit '7b879999fe2bef549ed1c04259fcd7f07e10e83b':
  Fix issue #7238170: Edit picture option is not available for the secondary user.