Tkt 2144: Improvements on mobile v3