Merge "Changed recent multi-window UI to use persist.sys.debug.multi_window"