Merge "remount: Simplify disable verity logic"