Merge "Avoid double-translating View background" into lmp-mr1-dev