Merge "HWUI: mSerialContext needs to outlive other serializing members" into sc-dev