Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0