Merge "Revert "Fix performance issue from refreshing runtime permission state before write.""