am 6f31760b: Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev

* commit '6f31760b25dd216b8bc0e7de170ab31cfda61367':
  Fixed a ltr bug where the buttons disappeared