Merge "Finish toast app op." into lmp-dev