Merge "Fix media having wrong expansion on QQS/landscape after fold/unfold" into tm-qpr-dev