Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev