Merge "Fix bug 3183378 - make theme attribute selectableItemBackground public."