Merge "Check permission state before revoking for notifications backup"