Merge "Revert "Set up status bar input layers on init."" into main