Merge "Only use bottom outset for main display." into klp-modular-dev