Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev