[LockScreen] To solve the merge conflicts because of the improper order of merging