[#1550] Merge the merge and attached states into filled state

They're the same now.
[#1550] Refactor the state machine into a simpler architecture

We just have two states now, so we can simplify stuff.
[#1550] Initialize correctly the status of the image-upload
[#1550] Remove "Remove" button, as we now only use the "X" at the input