Merge "Fix AppCompatSpinner not overlaying the IME" into mnc-ub-dev