Merge "Add home/lock screen argument to remaining methods"