Fixing issue 5064135, issue 5033850

-> id's were duplicated causing strange behaviour
   in onRestoreInstanceState

Change-Id: I20132942baaec54880c6d765b37d26ac2ffd31ee
3 files changed