Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev