#PS-1917 #comment remove spinner in Android live
merge conflict