Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev