Merge "Switch to persist.wm.debug" into tm-dev