Merge changes from topic "am-df8691c634724109818b94ab931236aa"

* changes:
  [automerger skipped] Merge "prevent crash with pin protected user and taskview" into tm-qpr-dev am: be175280 -s ours am: 970299f2 -s ours am: c605985f -s ours am: c1c4da9c -s ours
  [automerger skipped] prevent crash with pin protected user and taskview am: fa4038fb -s ours am: 93bfbf09 -s ours am: c3442616 -s ours am: 92b52c91 -s ours