Merge "SideFPS UX updates"