Merge "Add test for focal area collection on finished transition to lockscreen" into main