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

Change-Id: I8cc7b0729b35dfa7bb6bd2f19ce0bfbb842accf7