Merge "Fix issue #4466531: onServiceConnected() not called after..."