Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev