Merge "Flagging a permission in PM" into main