Merge "remount: Refactor partition filtering into helper functions."