Merge "Use color overlay for fixed rotation in btn nav" into main