Merge "Quick Settings: Avoid expand indicators shortly showing on edit"
am: 47c83a5f9d

Change-Id: Id07c6a9413fb3f647d8ead5a77012800ce5b1bc8