Merge "Add missed lock for startHomeOnDisplay"