Merge "Allow User Switcher to always be able to be launched in lockTaskMode" into tm-qpr-dev