Merge "Fix App Info padding" into lmp-dev