Merge "Fix for potential race condition in Spinners Added measure to try & ensure popups have time to collapse before trying to send TYPE_VIEW_SELECTED"