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

Change-Id: I968be340f90875e23e436e0209df331d8691908f