Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev