Merge "remount: Treat disable verity error as fatal only if verity is enabled"