Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev