Merge "Add help menu for Users and Location access" into jb-mr1-dev