Also fix a bug when selecting the dim target stack. Change-Id: Id9d5e28caf5e810c7eef1e3b0fd7a9f945f8d146