Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev