Merge "Minor Refactoring for phone status bar tests" into main