Merge "Fix padding between R and wifi icon" into lmp-dev