Merge "Fix padding when APM and share wifi button both shown." into main