Merge "LiveSession: raise upwards adaptation constraint" into lmp-dev