Merge "Ignore default layers that may show for a single entry during rotation" into main