Merge "Check for target watch in StatusBarManagerTest"