Replace fragile checks with checks for spinner on save

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