am 2c7d0f20: Merge "Fix restore position warning and static track adjustment" into mnc-dev

* commit '2c7d0f2013203588f9307166cad42902eb5a676f':
  Fix restore position warning and static track adjustment