Merge "Move two symbols into section for SystemUI"