Merge changes I0c69b6a2,I286015aa

* changes:
  Refresh legacy permission state right before writing.
  Revert "Refresh legacy state before writing to runtime permission persistence."