Merge "Remove obsolete state" into qt-r1-dev am: cee9ee343d
am: c6ad944f2e

Change-Id: I9acff3fd7e3e0a65b9d16ef21aad7bd3ff4a2599