Merge "Fix drawable being displayed empty when re-entering the target edit dialog." into cm-10.2

Change-Id: Id6dde9e7f689e71c9374bf88d79da3b684d02563