Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1