Merge "Improve StatusBarManager disable*() apis" into main