Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am: 36da2a208e

* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset