Merge "Revert "Strip PNG metadata"" into lmp-mr1-ub-dev