Merge "Merge "Fix QS visibility logs missing some info" into oc-dev am: df9b2e8d80 am: 86cc4bbac5"