Merge "Add null check in showLockTaskToast" into nyc-dev