Merge "Set scaling mode for legacy device surfaces." into mnc-dev