Merge "Fix Spinner showing multiple popups" into mnc-ub-dev
am: 91b5e75

* commit '91b5e75a4124cd1db18a7f9994bdf202da45531a':
  Fix Spinner showing multiple popups

Change-Id: Ia6eb2e778038ec7c968c676f6af77656539d4fd6