Ambient: If user turned off ambient, keep it off after split
am: cb60c7a87e

Change-Id: I7da07f53de4748462f06a805921e7dcd28637820