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

Change-Id: I7c9fb6e07b920e5bb113fc25e4010d2c33c3329a