Merge "Updated the LivePicker for tablet UI"