Merge "Fix issue #5446988: WindowManager warns BOOT TIMEOUT,..." into ics-mr0