am: 36da2a20 * commit '36da2a20': Consolidates config_windowOutsetBottom and circular_display_mask_offset