Merge "Add cleanup to the @After method in StatusBarManagerTest" into tm-dev