Merge "Consider addAction(int action) to possibly be a bit mask"