Merge "Update pattern unlock screen for LDPI" into gingerbread