Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev