Merge "Make remount into checkpointing for ext4 userdata a no-op"