Merge "Pad indication text to prevent clipping on side of screen." into qt-r1-dev
am: b7098f9d9c

Change-Id: I1f7280f7326183dce221691fea3d1b857458c42d