Merge "SideFPS UX updates" into tm-qpr-dev