Merge "Api feedback for status bar icon api"