Merge "Make sure config change items are executed in the order dispatched." into rvc-dev am: 0d8822c9 am: 7944d277 Change-Id: Ide23e7e73c7eb666c83602b4727b1eb3c9800663