Merge changes I8e538700,I336212a6

* changes:
  Improvements to preview scaling on IMS video calls.
  Fixed some strict mode violations.