automerge: 286f361 * commit '286f36112e424a173a5a57f881545045c54ec76b': Add padding when both data icon and wifi icon is visible
automerge: 286f361 * commit '286f36112e424a173a5a57f881545045c54ec76b': Add padding when both data icon and wifi icon is visible