Merge "Remove ZeroTopPaddingTextView" into ics-ub-clock-amazon