Preventing dead lock in layout inflation
am: e48b55d86e

Change-Id: Ide818f6d696e8458dd3e4e8451406d832d99ed0e