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

* commit '8e0929a32ed60b95a34416a5362df93f5a329b5f':
  [FRP] Open the lock setup screens in same task