Merge "[conflict] Resolve StatusHints image exploit across user. am: a853f6ba61" into tm-dev