* commit 'c584f7f44e4629e97e662e66f2a135ddb426fc7a': Fix erroneous requestLayout-during-layout issues