Update android to delegate item selection to correct item scope