Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev