Merge "Fixes alpha issue in lock screen shortcuts." into tm-qpr-dev