Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev