Merge "Generate a new id for each window" into rvc-dev am: c0a8645e4e am: bb08e3d610 am: 733ded33e6

Change-Id: I4c9946439da6f20a2bc13f3cc17d1720e2a20fac