Merge "Add mStrongModeEnabled to dump" into tm-dev