Merge "Added bookmark focus selector"