Merge "Do not create/update status bar input layer when caption isn't visible" into main