Merge "Fix NullPointerException in OverviewInputConsumer" into main