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

Change-Id: I033cf9cf74c3fe8d80791cc5039a1530332eaabc