Merge "Add UI considerations to layers"