Merge "prevent crash with pin protected user and taskview"