Merge "Listen to permission changes in permission monitor" into main