Revert "Replace fragile checks with checks for spinner on save"

This reverts commit a8e1e15efb2f14a27605dc77966c650c4536a416.

Change-Id: I4f93a443ecc0b239fa505e0c3bdd457d2043042e
Merge "Revert "Replace fragile checks with checks for spinner on save""