Merge "Add home/lock screen argument to remaining methods that require one" into tm-qpr-dev