Merge "Whitelist the current launcher for lock task tests" into pi-dev