Merge "Fix restore position warning and static track adjustment" into mnc-dev