Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev