Merge "Fix intermittent crash on copy cancelled." into arc-apps
am: 0bf7544792

Change-Id: I4722c35d0a4bb83e7b83b2dacb7e6da45ba4d225