am d83fc233: am 7c8f44ae: am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev * commit 'd83fc233': Surface:lockHardwareCanvas DO NOT MERGE