Merge "Move dark amount to StatusBarStateController"