Merge "Fix screen off after panel expansion" into tm-dev