Merge "Resolve StatusHints image exploit across user." into rvc-dev