Merge "Quick Settings: Avoid expand indicators shortly showing on edit" am: 47c83a5f am: 18a6d499 am: 8590d905 Change-Id: I33dbafa88f84091d7b2a0c5f5ae2a63f026564f9