Merge "Preventing system crash when pin slice fails" into qt-r1-dev
am: 3f7230cb93

Change-Id: Ie6760f19c4ced4350646944db52d2f4857d0d661