Merge "Make lock task check if focused better" into lmp-mr1-dev