Merge "Quick Settings: Avoid expand indicators shortly showing on edit" am: 47c83a5f9d am: 18a6d4990a
am: 8590d905cb

Change-Id: I33dbafa88f84091d7b2a0c5f5ae2a63f026564f9