LPS-36506 Add ability to have a choice of importing public and/or private layouts when using LAR import
LPS-36506 Update tests
LPS-36506 Fix bugs