Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit