am 04d63720: Merge "New spinners Bug: 5165176"

* commit '04d6372055f9552fbeed02f4e94d1d0e1e04e941':
  New spinners Bug: 5165176