Merge "move shell_transit sysprop to persist.wm" into tm-dev