Merge "Add Screen Layout Size and Long Tests" into ics-mr0