Merge "Force update uid state when pending uid state is applied" into qt-dev am: 4abf162016

Change-Id: I076f351c967a9e2ce287cfa91be5a6d0db790337