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

Change-Id: I50ece1dc71401855af31e7f4d7e13a469bf31c9f