Merge "PMS write settings on shutdown regardless of pending type" into tm-dev