Merge "remount: Auto remount option (-R) also tries to gain root" into main