Merge "Remove indents from TextView" into mnc-dev