Merge "Revert^2 "Clean up PLUG_IN_STATUS_BAR_CHIP flag"" into main