Merge "Convert page modification to using startAtomic()/endAtomic()"