Merge "Add null-check for lockscreenSmartspace" into tm-qpr-dev