Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev