Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev