Merge "Don't assume an A/B device when overriding the super partition name." into qt-dev