Updated Window API based on 7.2 API review

Change-Id: Ie6fa8b51c2fd1d1fe7def9ca7c11b4023eae52b7