Merge "Fix BEHAVIOR_SHOW_BARS_BY_TOUCH" into rvc-qpr-dev