Merge "Remove and cleanup flag for Custom lockscreen shortcuts" into udc-qpr-dev