Fixed some issues with capability updates propagating to listener, brought on par with Android SDK