Merge "Add additional tracing for nav button backgrounds" into rvc-dev