Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev