Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2