Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev