Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev